From 724f315ae60e8e202133860755fdf558aa62f811 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 7 Jun 2019 15:37:08 +0000
Subject: [PATCH] Stop exporting gtk_popover_bind_model

We can't improve popover menus as long as we
have to be able to work with any old popover
we're given. Remove this, so we can make
gtk_popover_new_from_model return a subclass.
---
 gtk/gtkpopover.c | 34 +---------------------------------
 gtk/gtkpopover.h |  5 -----
 2 files changed, 1 insertion(+), 38 deletions(-)

diff --git a/gtk/gtkpopover.c b/gtk/gtkpopover.c
index d1fdd73218..9c14e8d1d2 100644
--- a/gtk/gtkpopover.c
+++ b/gtk/gtkpopover.c
@@ -1717,39 +1717,7 @@ back_to_main (GtkWidget *popover)
   gtk_stack_set_visible_child_name (GTK_STACK (stack), "main");
 }
 
-/**
- * gtk_popover_bind_model:
- * @popover: a #GtkPopover
- * @model: (allow-none): the #GMenuModel to bind to or %NULL to remove
- *   binding
- * @action_namespace: (allow-none): the namespace for actions in @model
- *
- * Establishes a binding between a #GtkPopover and a #GMenuModel.
- *
- * The contents of @popover are removed and then refilled with menu items
- * according to @model.  When @model changes, @popover is updated.
- * Calling this function twice on @popover with different @model will
- * cause the first binding to be replaced with a binding to the new
- * model. If @model is %NULL then any previous binding is undone and
- * all children are removed.
- *
- * If @action_namespace is non-%NULL then the effect is as if all
- * actions mentioned in the @model have their names prefixed with the
- * namespace, plus a dot.  For example, if the action “quit” is
- * mentioned and @action_namespace is “app” then the effective action
- * name is “app.quit”.
- *
- * This function uses #GtkActionable to define the action name and
- * target values on the created menu items.  If you want to use an
- * action group other than “app” and “win”, or if you want to use a
- * #GtkMenuShell outside of a #GtkApplicationWindow, then you will need
- * to attach your own action group to the widget hierarchy using
- * gtk_widget_insert_action_group().  As an example, if you created a
- * group with a “quit” action and inserted it with the name “mygroup”
- * then you would use the action name “mygroup.quit” in your
- * #GMenuModel.
- */
-void
+static void
 gtk_popover_bind_model (GtkPopover  *popover,
                         GMenuModel  *model,
                         const gchar *action_namespace)
diff --git a/gtk/gtkpopover.h b/gtk/gtkpopover.h
index 7b42ef7298..9a0ae9866a 100644
--- a/gtk/gtkpopover.h
+++ b/gtk/gtkpopover.h
@@ -65,11 +65,6 @@ GDK_AVAILABLE_IN_ALL
 GtkWidget *     gtk_popover_new_from_model  (GtkWidget  *relative_to,
                                              GMenuModel *model);
 
-GDK_AVAILABLE_IN_ALL
-void            gtk_popover_bind_model      (GtkPopover  *popover,
-                                             GMenuModel  *model,
-                                             const gchar *action_namespace);
-
 GDK_AVAILABLE_IN_ALL
 void            gtk_popover_set_relative_to (GtkPopover   *popover,
                                            GtkWidget  *relative_to);
-- 
2.30.2